Improved planning and control